Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 07:24:44 +0000 (10:24 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 07:24:44 +0000 (10:24 +0300)
commit320c25197abc1277b03e7ab4c6c827b219f38994
tree7d25d2364996ddc3c3a73f82df9aedd0ce7496ca
parentb9b9b5e2f66b48e8a6a70bad1d27d948117515a9
parente985cb5edf06cadc0adfb8c886658f87d4ff8964
Merge from trunk.
nt/inc/ms-w32.h